bitkeeper revision 1.1479 (428d371brHhQmZxRRggrDJvMfEHd7A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

diff --cc linux-2.4.29-xen-sparse/include/asm-xen/page.h
Simple merge

diff --cc linux-2.4.29-xen-sparse/mkbuildtree
index 714d85e69f99ef03fc8682fdd18f3cf1a43452e2,7e8177802c3c1abb3686655031e5a4e54f89d19c..da059ad6cf2941cdb4ea93cde8facda3169030ed
--- 1/linux-2.4.29-xen-sparse/mkbuildtree
--- 2/linux-2.4.29-xen-sparse/mkbuildtree
+++ b/linux-2.4.29-xen-sparse/mkbuildtree
@@@ -208,11 -207,10 +208,10 @@@ ln -sf ../asm-i386/vm86.
  ln -sf ../../${LINUX_26}/include/asm-xen/balloon.h
  ln -sf ../../${LINUX_26}/include/asm-xen/ctrl_if.h
  ln -sf ../../${LINUX_26}/include/asm-xen/evtchn.h
- ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h
  ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h
 -ln -sf ../../${LINUX_26}/include/asm-xen/multicall.h
  ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h
  ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/synch_bitops.h
 +ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/hypercall.h
  
  mkdir -p linux-public && cd linux-public
  ln -sf ../../../${LINUX_26}/include/asm-xen/linux-public/privcmd.h
@@@ -229,9 -227,10 +228,8 @@@ ln -sf ../../i386/kernel/sys_i386.
  ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c
  ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c
  ln -sf ../../../${LINUX_26}/arch/xen/kernel/fixup.c
- ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c
  ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
  ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c
 -ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/ioport.c
 -ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/pci-dma.c
  
  cd ${AD}/arch/xen/lib
  ln -sf ../../i386/lib/checksum.S 

diff --cc linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
Simple merge